x11: Stop using surface->parent
authorMatthias Clasen <mclasen@redhat.com>
Sat, 23 Mar 2019 13:12:10 +0000 (09:12 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 28 May 2019 20:25:13 +0000 (20:25 +0000)
It is always NULL.

gdk/x11/gdksurface-x11.c

index 63ce6e9da7d4498a7c422e8f0a22636e13cc11bb..6f23e9ee48bdf72a0397a1913305dab95d12da00 100644 (file)
@@ -858,23 +858,6 @@ _gdk_x11_display_create_surface_impl (GdkDisplay    *display,
 
   impl->override_redirect = FALSE;
 
-  /* Sanity checks */
-  switch (surface->surface_type)
-    {
-    case GDK_SURFACE_TOPLEVEL:
-    case GDK_SURFACE_TEMP:
-      if (surface->parent)
-        {
-          /* The common code warns for this case */
-          xparent = GDK_SCREEN_XROOTWIN (x11_screen);
-        }
-      break;
-
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
   if (!surface->input_only)
     {
       class = InputOutput;
@@ -932,16 +915,8 @@ _gdk_x11_display_create_surface_impl (GdkDisplay    *display,
   impl->unscaled_width = surface->width * impl->surface_scale;
   impl->unscaled_height = surface->height * impl->surface_scale;
 
-  if (surface->parent)
-    {
-      abs_x = surface->parent->abs_x;
-      abs_y = surface->parent->abs_y;
-    }
-  else
-    {
-      abs_x = 0;
-      abs_y = 0;
-    }
+  abs_x = 0;
+  abs_y = 0;
 
   impl->xid = XCreateWindow (xdisplay, xparent,
                              (surface->x + abs_x) * impl->surface_scale,
@@ -2390,9 +2365,6 @@ gdk_x11_surface_get_frame_extents (GdkSurface    *surface,
   rect->width = 1;
   rect->height = 1;
 
-  while (surface->parent && (surface->parent)->parent)
-    surface = surface->parent;
-
   impl = GDK_SURFACE_IMPL_X11 (surface->impl);
 
   /* Refine our fallback answer a bit using local information */